From 0832cdb633ded7759392ccbacad545996c5de1c8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=98yvind=20Kol=C3=A5s?= Date: Sat, 19 Jan 2008 23:08:11 +0000 Subject: [PATCH] Applied patch from Deji Akingunola to make babl correctly pick up the path to the extensions on 64bit systems. Fixes bug #510038 * babl/Makefile.am: added -DLIBDIR * babl/babl-extension.c: use libdir and not PREFIX "/lib" when defining the default BABL_PATH. svn path=/trunk/; revision=274 --- ChangeLog | 10 ++++++++++ babl/Makefile.am | 2 +- babl/babl-extension.c | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9731e30..0591e28 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-01-17 Øyvind Kolås + + Applied patch from Deji Akingunola to make babl + correctly pick up the path to the extensions on 64bit systems. Fixes + bug #510038 + + * babl/Makefile.am: added -DLIBDIR + * babl/babl-extension.c: use libdir and not PREFIX "/lib" when + defining the default BABL_PATH. + 2008-01-10 Sven Neumann * extensions/gimp-8bit.c: added extension to speed up code paths diff --git a/babl/Makefile.am b/babl/Makefile.am index 7fb676c..24c3048 100644 --- a/babl/Makefile.am +++ b/babl/Makefile.am @@ -45,7 +45,7 @@ library_include_HEADERS = \ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/babl/base -AM_CPPFLAGS = -DPREFIX=\""$(prefix)"\" +AM_CPPFLAGS = -DLIBDIR=\""$(libdir)"\" lib_LTLIBRARIES= libbabl-@BABL_API_VERSION@.la libbabl_@BABL_API_VERSION@_la_SOURCES= $(h_sources) $(c_sources) diff --git a/babl/babl-extension.c b/babl/babl-extension.c index 5f47b5e..47da01c 100644 --- a/babl/babl-extension.c +++ b/babl/babl-extension.c @@ -22,7 +22,7 @@ #include "config.h" #endif -#define BABL_PATH PREFIX "/lib/" BABL_LIBRARY +#define BABL_PATH LIBDIR "/" BABL_LIBRARY #define BABL_INIT_HOOK init_hook (); #define BABL_DESTROY_HOOK destroy_hook (); -- 2.30.2